Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 30 May 2010 22:54:27 +0000 (22:54 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 30 May 2010 22:54:27 +0000 (22:54 +0000)

Trivial merge